Remove six at all places where used. [jensens]

